Resolve CVS conflicts

diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index d7d8a0f58b2160cce148a47d70969dd6f87a6a5d..cc692c1f975c46fc6ac185952246dca94a507638 100644 (file)
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -734,3 +734,4 @@ ACTION and ARG should be legal convert command."
 ;;; thumbs.el ends here
 
 
+;;; arch-tag: f9ac1ef8-83fc-42c0-8069-1fae43fd2e5c